Change in openvpn[master]: --http-proxy-user-pass: allow to specify in either order with --http-...
A message that is not in the archive (sent off-list or not yet received): gerrit.1705068839000.I6f402db2fb73f1206fbc1139c47d2bf4378376fa@...2715...
Attention is currently required from: plaisthos.
Hello plaisthos,
I'd like you to do a code review.
Please visit
http://gerrit.openvpn.net/c/openvpn/+/499?usp=email
to review the following change.
Change subject: --http-proxy-user-pass: allow to specify in either order with --http-proxy
......................................................................
--http-proxy-user-pass: allow to specify in either order with --http-proxy
Previously, when using a third argument to --http-proxy other than auto/auto-nct, order did matter between --http-proxy and --http-proxy-user-pass. Always prefer --http-proxy-user-pass when given.
---
M src/openvpn/options.c
M src/openvpn/proxy.c
M src/openvpn/proxy.h
3 files changed, 11 insertions(+), 3 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/99/499/1
src/openvpn/options.c +3 -1
@@ -1649,6 +1649,8 @@SHOW_STR (port);SHOW_STR (auth_method_string);SHOW_STR (auth_file); +SHOW_STR (auth_file_up); +SHOW_BOOL (inline_creds);SHOW_STR (http_version);SHOW_STR (user_agent);for (i =0 ; i <MAX_CUSTOM_HTTP_HEADER && o->custom_headers[i].name; i++)
@@ -6824,7 +6826,7 @@struct http_proxy_options *ho;VERIFY_PERMISSION (OPT_P_GENERAL |OPT_P_INLINE ); ho =init_http_proxy_options_once (&options->ce.http_proxy_options, &options->gc); - ho->auth_file = p[1 ]; + ho->auth_file_up = p[1 ]; ho->inline_creds = is_inline; }else if (streq (p[0 ],"http-proxy-retry" ) ||streq (p[0 ],"socks-proxy-retry" ))
src/openvpn/proxy.c +6 -1
@@ -271,6 +271,11 @@if (!static_proxy_user_pass.defined) {unsigned int flags =GET_USER_PASS_MANAGEMENT ; +const char *auth_file = p->options.auth_file; +if (p->options.auth_file_up) + { + auth_file = p->options.auth_file_up; + }if (p->queried_creds) { flags |=GET_USER_PASS_PREVIOUS_CREDS_FAILED ;
@@ -280,7 +285,7 @@ flags |=GET_USER_PASS_INLINE_CREDS ; }get_user_pass (&static_proxy_user_pass, - p->options.auth_file, + auth_file,UP_TYPE_PROXY , flags); p->queried_creds = true;
src/openvpn/proxy.h +2 -1
@@ -52,10 +52,11 @@const char *auth_method_string;const char *auth_file; +const char *auth_file_up;/* specified with --http-proxy-user-pass */ const char *http_version;const char *user_agent;struct http_custom_header custom_headers[MAX_CUSTOM_HTTP_HEADER ]; -bool inline_creds; +bool inline_creds;/* auth_file_up is inline credentials */ };struct http_proxy_options_simple {
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/499?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I6f402db2fb73f1206fbc1139c47d2bf4378376fa
Gerrit-Change-Number: 499
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-MessageType: newchange
Attention is currently required from: flichtenheld, plaisthos.
cron2 has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/499?usp=email )
Change subject: --http-proxy-user-pass: allow to specify in either order with --http-proxy
......................................................................
Patch Set 1: Code-Review+2
(1 comment)
Patchset:
PS1:
I think this is a reasonable change - it ensures config consistency, and the code looks good (not tested). The compile fails have been spurious and went away on re-run.
I'm not sure yet if this should go to 2.6 as well, though. Maybe, because "fixing inconsistent behaviour = bugfix", and "not very intrusive"?
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/499?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I6f402db2fb73f1206fbc1139c47d2bf4378376fa
Gerrit-Change-Number: 499
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Mon, 22 Jan 2024 08:28:25 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
PATCH 1/1 --http-proxy-user-pass: allow to specify in either order with --http-proxy
In reply to a message not in the archiveFrom: Frank Lichtenheld <[email protected]...>
Previously, when using a third argument to --http-proxy other than auto/auto-nct, order did matter between --http-proxy and --http-proxy-user-pass. Always prefer --http-proxy-user-pass when given.
---
This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/499
This mail reflects revision 1 of this Change. Acked-by according to Gerrit (reflected above):
Gert Doering <[email protected]...>
src/openvpn/options.c +3 -1
@@ -1649,6 +1649,8 @@SHOW_STR (port);SHOW_STR (auth_method_string);SHOW_STR (auth_file); +SHOW_STR (auth_file_up); +SHOW_BOOL (inline_creds);SHOW_STR (http_version);SHOW_STR (user_agent);for (i =0 ; i <MAX_CUSTOM_HTTP_HEADER && o->custom_headers[i].name; i++)
@@ -6824,7 +6826,7 @@struct http_proxy_options *ho;VERIFY_PERMISSION (OPT_P_GENERAL |OPT_P_INLINE ); ho =init_http_proxy_options_once (&options->ce.http_proxy_options, &options->gc); - ho->auth_file = p[1 ]; + ho->auth_file_up = p[1 ]; ho->inline_creds = is_inline; }else if (streq (p[0 ],"http-proxy-retry" ) ||streq (p[0 ],"socks-proxy-retry" ))
src/openvpn/proxy.c +6 -1
@@ -271,6 +271,11 @@if (!static_proxy_user_pass.defined) {unsigned int flags =GET_USER_PASS_MANAGEMENT ; +const char *auth_file = p->options.auth_file; +if (p->options.auth_file_up) + { + auth_file = p->options.auth_file_up; + }if (p->queried_creds) { flags |=GET_USER_PASS_PREVIOUS_CREDS_FAILED ;
@@ -280,7 +285,7 @@ flags |=GET_USER_PASS_INLINE_CREDS ; }get_user_pass (&static_proxy_user_pass, - p->options.auth_file, + auth_file,UP_TYPE_PROXY , flags); p->queried_creds = true;
src/openvpn/proxy.h +2 -1
@@ -52,10 +52,11 @@const char *auth_method_string;const char *auth_file; +const char *auth_file_up;/* specified with --http-proxy-user-pass */ const char *http_version;const char *user_agent;struct http_custom_header custom_headers[MAX_CUSTOM_HTTP_HEADER ]; -bool inline_creds; +bool inline_creds;/* auth_file_up is inline credentials */ };struct http_proxy_options_simple {
[Openvpn-devel] [PATCH applied] Re: --http-proxy-user-pass: allow to specify in either order with --http-proxy
Stared at code, stared at manpage (+changes), patch makes sense.
Haven't tested "for real" beyond "passes t_client tests", which do use http-proxy, but which do not use an authenticated proxy (yet -> TBD!).
Your patch has been applied to the master and release/2.6 branch ("make behaviour consistent" counts as "bugfix", and it's only a small and localized change).
commit a634cc5eccd55f1d14197da7376bb819bdf72cb6 (master) commit 1141e7505747dd6029ac7cf19b6c2de99a685ccc (release/2.6)
Author: Frank Lichtenheld Date: Mon Jan 22 10:21:22 2024 +0100
--http-proxy-user-pass: allow to specify in either order with --http-proxy
Signed-off-by: Frank Lichtenheld <[email protected]...>
Acked-by: Gert Doering <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg28099.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering
cron2 has uploaded a new patch set (#2) to the change originally created by flichtenheld. ( http://gerrit.openvpn.net/c/openvpn/+/499?usp=email )
The following approvals got outdated and were removed:
Code-Review+2 by cron2
Change subject: --http-proxy-user-pass: allow to specify in either order with --http-proxy
......................................................................
--http-proxy-user-pass: allow to specify in either order with --http-proxy
Previously, when using a third argument to --http-proxy other than auto/auto-nct, order did matter between --http-proxy and --http-proxy-user-pass. Always prefer --http-proxy-user-pass when given.
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg28099.html
---
M src/openvpn/options.c
M src/openvpn/proxy.c
M src/openvpn/proxy.h
3 files changed, 11 insertions(+), 3 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/99/499/2
src/openvpn/options.c +3 -1
@@ -1649,6 +1649,8 @@SHOW_STR (port);SHOW_STR (auth_method_string);SHOW_STR (auth_file); +SHOW_STR (auth_file_up); +SHOW_BOOL (inline_creds);SHOW_STR (http_version);SHOW_STR (user_agent);for (i =0 ; i <MAX_CUSTOM_HTTP_HEADER && o->custom_headers[i].name; i++)
@@ -6833,7 +6835,7 @@struct http_proxy_options *ho;VERIFY_PERMISSION (OPT_P_GENERAL |OPT_P_INLINE ); ho =init_http_proxy_options_once (&options->ce.http_proxy_options, &options->gc); - ho->auth_file = p[1 ]; + ho->auth_file_up = p[1 ]; ho->inline_creds = is_inline; }else if (streq (p[0 ],"http-proxy-retry" ) ||streq (p[0 ],"socks-proxy-retry" ))
src/openvpn/proxy.c +6 -1
@@ -271,6 +271,11 @@if (!static_proxy_user_pass.defined) {unsigned int flags =GET_USER_PASS_MANAGEMENT ; +const char *auth_file = p->options.auth_file; +if (p->options.auth_file_up) + { + auth_file = p->options.auth_file_up; + }if (p->queried_creds) { flags |=GET_USER_PASS_PREVIOUS_CREDS_FAILED ;
@@ -280,7 +285,7 @@ flags |=GET_USER_PASS_INLINE_CREDS ; }get_user_pass (&static_proxy_user_pass, - p->options.auth_file, + auth_file,UP_TYPE_PROXY , flags); p->queried_creds = true;
src/openvpn/proxy.h +2 -1
@@ -52,10 +52,11 @@const char *auth_method_string;const char *auth_file; +const char *auth_file_up;/* specified with --http-proxy-user-pass */ const char *http_version;const char *user_agent;struct http_custom_header custom_headers[MAX_CUSTOM_HTTP_HEADER ]; -bool inline_creds; +bool inline_creds;/* auth_file_up is inline credentials */ };struct http_proxy_options_simple {
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/499?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I6f402db2fb73f1206fbc1139c47d2bf4378376fa
Gerrit-Change-Number: 499
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: newpatchset
cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/499?usp=email )
Change subject: --http-proxy-user-pass: allow to specify in either order with --http-proxy
......................................................................
--http-proxy-user-pass: allow to specify in either order with --http-proxy
Previously, when using a third argument to --http-proxy other than auto/auto-nct, order did matter between --http-proxy and --http-proxy-user-pass. Always prefer --http-proxy-user-pass when given.
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg28099.html
---
M src/openvpn/options.c
M src/openvpn/proxy.c
M src/openvpn/proxy.h
3 files changed, 11 insertions(+), 3 deletions(-)
src/openvpn/options.c +3 -1
@@ -1649,6 +1649,8 @@SHOW_STR (port);SHOW_STR (auth_method_string);SHOW_STR (auth_file); +SHOW_STR (auth_file_up); +SHOW_BOOL (inline_creds);SHOW_STR (http_version);SHOW_STR (user_agent);for (i =0 ; i <MAX_CUSTOM_HTTP_HEADER && o->custom_headers[i].name; i++)
@@ -6833,7 +6835,7 @@struct http_proxy_options *ho;VERIFY_PERMISSION (OPT_P_GENERAL |OPT_P_INLINE ); ho =init_http_proxy_options_once (&options->ce.http_proxy_options, &options->gc); - ho->auth_file = p[1 ]; + ho->auth_file_up = p[1 ]; ho->inline_creds = is_inline; }else if (streq (p[0 ],"http-proxy-retry" ) ||streq (p[0 ],"socks-proxy-retry" ))
src/openvpn/proxy.c +6 -1
@@ -271,6 +271,11 @@if (!static_proxy_user_pass.defined) {unsigned int flags =GET_USER_PASS_MANAGEMENT ; +const char *auth_file = p->options.auth_file; +if (p->options.auth_file_up) + { + auth_file = p->options.auth_file_up; + }if (p->queried_creds) { flags |=GET_USER_PASS_PREVIOUS_CREDS_FAILED ;
@@ -280,7 +285,7 @@ flags |=GET_USER_PASS_INLINE_CREDS ; }get_user_pass (&static_proxy_user_pass, - p->options.auth_file, + auth_file,UP_TYPE_PROXY , flags); p->queried_creds = true;
src/openvpn/proxy.h +2 -1
@@ -52,10 +52,11 @@const char *auth_method_string;const char *auth_file; +const char *auth_file_up;/* specified with --http-proxy-user-pass */ const char *http_version;const char *user_agent;struct http_custom_header custom_headers[MAX_CUSTOM_HTTP_HEADER ]; -bool inline_creds; +bool inline_creds;/* auth_file_up is inline credentials */ };struct http_proxy_options_simple {
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/499?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I6f402db2fb73f1206fbc1139c47d2bf4378376fa
Gerrit-Change-Number: 499
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: merged